--- saved-model-to-tflite.py	2025-05-19 23:32:37.000000 +0000
+++ saved-model-to-tflite.py	2025-05-19 23:36:31.806946 +0000
@@ -30,11 +30,10 @@
     json_file = "output_spec.json"
     src_json = os.path.join(sm_dir, json_file)
     if tf.io.gfile.exists(src_json):
         tf.io.gfile.copy(src_json, os.path.join(tfl_dir, json_file))
     tf.mlir.experimental.tflite_to_tosa_bytecode(
-        tfl_path,
-        os.path.join(tfl_dir, 'model.tosa')
+        tfl_path, os.path.join(tfl_dir, "model.tosa")
     )
 
 if __name__ == "__main__":
     main(sys.argv)

diff --git a/mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp b/mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp
index 36b1fed29..5aadfab4e 100644
--- a/mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp
+++ b/mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp
@@ -223,6 +223,6 @@ void mlir::populateMemRefToEmitCTypeConversion(TypeConverter &typeConverter) {
 
 void mlir::populateMemRefToEmitCConversionPatterns(
     RewritePatternSet &patterns, const TypeConverter &converter) {
-  patterns.add<ConvertAlloca, ConvertGlobal, ConvertGetGlobal,
-               ConvertLoad, ConvertStore>(converter, patterns.getContext());
+  patterns.add<ConvertAlloca, ConvertGlobal, ConvertGetGlobal, ConvertLoad,
+               ConvertStore>(converter, patterns.getContext());
 }
diff --git a/mlir/lib/Conversion/TosaToArith/TosaToArith.cpp b/mlir/lib/Conversion/TosaToArith/TosaToArith.cpp
index da4655e41..8261100b1 100644
--- a/mlir/lib/Conversion/TosaToArith/TosaToArith.cpp
+++ b/mlir/lib/Conversion/TosaToArith/TosaToArith.cpp
@@ -35,16 +35,16 @@ public:
 };
 
 class ConstShapeOpConverter : public OpRewritePattern<tosa::ConstShapeOp> {
-  public:
-    using OpRewritePattern<tosa::ConstShapeOp>::OpRewritePattern;
-  
-    LogicalResult matchAndRewrite(tosa::ConstShapeOp op,
-                                  PatternRewriter &rewriter) const final {
-      rewriter.replaceOpWithNewOp<shape::ConstShapeOp>(op, op.getValues());
-      return success();
-    }
-  };
-  
+public:
+  using OpRewritePattern<tosa::ConstShapeOp>::OpRewritePattern;
+
+  LogicalResult matchAndRewrite(tosa::ConstShapeOp op,
+                                PatternRewriter &rewriter) const final {
+    rewriter.replaceOpWithNewOp<shape::ConstShapeOp>(op, op.getValues());
+    return success();
+  }
+};
+
 Type matchContainerType(Type element, Type container) {
   if (auto shapedTy = dyn_cast<ShapedType>(container))
     return shapedTy.clone(element);
diff --git a/mlir/lib/Target/Cpp/TranslateRegistration.cpp b/mlir/lib/Target/Cpp/TranslateRegistration.cpp
index a6afa6ae2..9dd125db7 100644
--- a/mlir/lib/Target/Cpp/TranslateRegistration.cpp
+++ b/mlir/lib/Target/Cpp/TranslateRegistration.cpp
@@ -9,8 +9,8 @@
 #include "mlir/Dialect/ControlFlow/IR/ControlFlow.h"
 #include "mlir/Dialect/EmitC/IR/EmitC.h"
 #include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/Dialect/Math/IR/Math.h"
+#include "mlir/Dialect/MemRef/IR/MemRef.h"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/Target/Cpp/CppEmitter.h"
diff --git a/mlir/lib/Target/Cpp/TranslateToCpp.cpp b/mlir/lib/Target/Cpp/TranslateToCpp.cpp
index 1ed68a90f..aa5891c89 100644
--- a/mlir/lib/Target/Cpp/TranslateToCpp.cpp
+++ b/mlir/lib/Target/Cpp/TranslateToCpp.cpp
@@ -1145,10 +1145,10 @@ static LogicalResult printOperation(CppEmitter &emitter,
   raw_indented_ostream &os = emitter.ostream();
   os << "class MyClass final {\n";
   auto argAttrs = functionOp.getArgAttrs();
-  
+
   std::map<std::string, Value> fields;
   if (argAttrs)
-    for (auto [a,v] : zip(*argAttrs, functionOp.getArguments())) {
+    for (auto [a, v] : zip(*argAttrs, functionOp.getArguments())) {
       if (auto da = dyn_cast<mlir::DictionaryAttr>(a)) {
         auto nv = da.getNamed("tf_saved_model.index_path")->getValue();
         auto name = cast<mlir::StringAttr>(cast<mlir::ArrayAttr>(nv)[0]).str();
@@ -1160,27 +1160,29 @@ static LogicalResult printOperation(CppEmitter &emitter,
       }
     }
 
-  for (auto & r : functionOp->getRegions())
+  for (auto &r : functionOp->getRegions())
     for (auto &b : r.getBlocks())
       for (auto &opt : b.getOperations())
         if (auto alloc = dyn_cast<memref::AllocOp>(opt)) {
           auto name = emitter.getOrCreateName(alloc).str();
           fields[name] = alloc;
-          if (failed(emitter.emitType(alloc.getLoc(), alloc.getType().getElementType())))
+          if (failed(emitter.emitType(alloc.getLoc(),
+                                      alloc.getType().getElementType())))
             return failure();
-          os << " [" << alloc.getType().getNumElements() <<"] ";
+          os << " [" << alloc.getType().getNumElements() << "] ";
           os << " " << name << ";\n";
         }
   os << "  std::map<std::string, char*> _buffer_map {";
-  for (auto &[n,v]:fields)
-    os << "{ \"" << n << "\"" << ", reinterpret_cast<char*>(" << emitter.getOrCreateName(v) << ") },";
+  for (auto &[n, v] : fields)
+    os << "{ \"" << n << "\"" << ", reinterpret_cast<char*>("
+       << emitter.getOrCreateName(v) << ") },";
   os << "  };\n";
   os << "  char* getBufferForName(const std::string& name) const {\n";
   os << "    auto it = _buffer_map.find(name);\n";
   os << "    return (it == _buffer_map.end()) ? nullptr : it->second;\n";
   os << "  }\n";
   CppEmitter::Scope scope(emitter);
-  
+
   if (functionOp.getSpecifiers()) {
     for (Attribute specifier : functionOp.getSpecifiersAttr()) {
       os << cast<StringAttr>(specifier).str() << " ";
@@ -1201,7 +1203,8 @@ static LogicalResult printOperation(CppEmitter &emitter,
     os << ");";
     return success();
   }
-  // if (failed(printFunctionArgs(emitter, operation, functionOp.getArguments())))
+  // if (failed(printFunctionArgs(emitter, operation,
+  // functionOp.getArguments())))
   //   return failure();
   os << ") {\n";
   if (failed(printFunctionBody(emitter, operation, functionOp.getBlocks())))